ia64: fix build in grant table and tmem code

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 9e9c7f51f5a029478a87ee9aa6b5ac0ea74d559d..4b4c18cd6bc1de44c60315ff426d02984786ad05 100644 (file)
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -142,10 +142,11 @@ shared_entry_header(struct grant_table *t, grant_ref_t ref)
 /* Check if the page has been paged out */
 static int __get_paged_frame(unsigned long gfn, unsigned long *frame, int readonly, struct domain *rd)
 {
+    int rc = GNTST_okay;
+#if defined(P2M_PAGED_TYPES) || defined(P2M_SHARED_TYPES)
     struct p2m_domain *p2m;
     p2m_type_t p2mt;
     mfn_t mfn;
-    int rc = GNTST_okay;
     
     p2m = p2m_get_hostp2m(rd);
     if ( readonly )
@@ -163,6 +164,9 @@ static int __get_paged_frame(unsigned long gfn, unsigned long *frame, int readon
        *frame = INVALID_MFN;
        rc = GNTST_bad_page;
     }
+#else
+    *frame = readonly ? gmfn_to_mfn(rd, gfn) : gfn_to_mfn_private(rd, gfn);
+#endif
     
     return rc;
 }

diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c
index f1aa709b82c811d146ed22d703035ff952149f80..0221355ea7830c562e260c566b793c81960b7bbc 100644 (file)
--- a/xen/common/tmem_xen.c
+++ b/xen/common/tmem_xen.c
@@ -95,8 +95,8 @@ static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn,
     return NULL;
 }
 
-static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp,
-                                bool_t mark_dirty)
+static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp,
+                                unsigned long cli_mfn, bool_t mark_dirty)
 {
     ASSERT(0);
 }